I authored the patches, I chose to add them to the "parent" project
first. This commit propagates them here (which was the intention all
along).

See the following pull requests:
nmeum#191
nmeum#192